Skip to content

[23923] Ignore new RTPSParticipantAttributes (backport #294)#304

Merged
cferreiragonz merged 2 commits into
1.4.xfrom
mergify/bp/1.4.x/pr-294
Jun 2, 2026
Merged

[23923] Ignore new RTPSParticipantAttributes (backport #294)#304
cferreiragonz merged 2 commits into
1.4.xfrom
mergify/bp/1.4.x/pr-294

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jun 2, 2026

Description

PR eProsima/Fast-DDS#6370 introduces new RTPSParticipantAttributes class. This PR ignores them similarly to the original one.

@Mergifyio backport 2.5.x 2.4.x 2.2.x 1.4.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A: Changes are API compatible.
  • : Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.
This is an automatic backport of pull request #294 done by [Mergify](https://mergify.com).

@cferreiragonz @mergify
Ignore new RTPSParticipantAttributes (#294)
a2ba51e 
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
(cherry picked from commit 99dc814)

# Conflicts:
#	fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i
@mergify mergify Bot added the conflicts label Jun 2, 2026
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jun 2, 2026

Cherry-pick of 99dc814 has failed:

On branch mergify/bp/1.4.x/pr-294
Your branch is up to date with 'origin/1.4.x'.

You are currently cherry-picking commit 99dc814.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.i

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@cferreiragonz cferreiragonz added this to the v1.4.5 milestone Jun 2, 2026
@mergify mergify Bot mentioned this pull request Jun 2, 2026
Merged
7 tasks
@cferreiragonz
Solve conflicts
d6fea1d 
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz self-requested a review June 2, 2026 12:26
@github-actions github-actions Bot added the ci-pending PR which CI is running label Jun 2, 2026
@cferreiragonz cferreiragonz merged commit fd804eb into 1.4.x Jun 2, 2026
9 checks passed
@cferreiragonz cferreiragonz deleted the mergify/bp/1.4.x/pr-294 branch June 2, 2026 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cferreiragonz cferreiragonz cferreiragonz approved these changes

Assignees

No one assigned

Labels

ci-pending PR which CI is running

Projects

None yet

Milestone

v1.4.5

Development

Successfully merging this pull request may close these issues.

1 participant

@cferreiragonz